From f17888fc962b5249f9b6b34f28a61998c3092018 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 31 Jan 2012 11:39:37 +0000 Subject: [PATCH] xen: do not remap pirqs if !is_hvm_pv_evtchn_domain If the guest is an HVM guest and it is not using the vector callback mechanism, refuse to remap pirqs onto event channels. Signed-off-by: Stefano Stabellini Tested-by: Paulian Bogdan Marinca Committed-by: Keir Fraser --- xen/arch/x86/physdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index df92cc7fdc..a3ceb7d84f 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -93,6 +93,15 @@ int physdev_map_pirq(domid_t domid, int type, int *index, int *pirq_p, if ( domid == DOMID_SELF && is_hvm_domain(d) ) { + /* + * Only makes sense for vector-based callback, else HVM-IRQ logic + * calls back into itself and deadlocks on hvm_domain.irq_lock. + */ + if ( !is_hvm_pv_evtchn_domain(d) ) + { + ret = -EINVAL; + goto free_domain; + } ret = physdev_hvm_map_pirq(d, type, index, pirq_p); goto free_domain; } -- 2.30.2